Merge "Fixes OpaLayoutTest to pass by adding SysuiTestCase (1/2)" into pi-dev