Merge "Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev am: c54d84a8 am: 855ecdd0 am: 7becfa71" into rvc-qpr-dev-plus-aosp