Merge "Gralloc: Update layer_count while calling size calculation APIs" into display.lnx.5.0