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

Change-Id: I94f15707b5d975f98eba5806f955f718d2b53ff3