Merge "Enhance some UI tests" into rvc-dev am: 73aacb4839 am: 12e95f43a3

Change-Id: I980119d43553ad2e9ce573f4a2dbcf2f6dee928e