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