Merge "Correcting Buffer Allocation for Shared Display" into mnc-dev am: 6d1537bc am: 5410ce3f am: 4ef14ee0 am: fec92270 am: 19ec51d8 am: 39804d44 am: 85a0181c am: 47b0de3b am: c7a50efa am: 58018eda am: 81d474d0 am: 1e67e403 am: 96117526 Change-Id: I48852040e2e4dcc27beea5c8dd6901952deb2789