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