Merge changes I0a54ddf3,I10fd4e2e

* changes:
  Remove references to nav bar views in StatusBar
  Setup on device testing for sys ui