Merge "Enhance some UI tests" into rvc-dev am: 73aacb4839 am: 6dab5ec7c2

Change-Id: I64c96fe3340607fb58992104bf9a192b29e05516