am a7d389ba: Merge "Fix and cleanup UI rendering CTS tests" into lmp-sprout-dev

* commit 'a7d389ba955d7425ad1060c5b922418fd48881b4':
  Fix and cleanup UI rendering CTS tests