Merge "Correcting Buffer Allocation for Shared Display" into mnc-dev am: 6d1537bc am: 5410ce3f am: 4ef14ee0 am: fec92270 am: 19ec51d8 Change-Id: Icf6301e1128b314b4915482c3b716da4742bc3d1