Merge "Add a @hide ctr to disable background layer in ActivityView & SurfaceView" into rvc-dev