Merge "RESTRICT AUTOMERGE - Explicitly disable BLAST for SurfaceControlViewHost surfaces" into rvc-dev am: 27f83cdb am: 06a617aa Change-Id: I2065b7881d4d3c0370dd197936d53a28ec433433