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

Change-Id: Id1d29cbfef3e5f3323a9ae1785bbb013b5c83889