Merge "Re-add test that SurfaceControlViewHost views are Hardware-Accelerated""" into rvc-dev