am 8732bee8: am fdc0d929: Merge "app launch test fixes and improvements" into jb-mr1.1-dev

* commit '8732bee8d1e2ffc7a163769904bd799ac2730b4e':
  app launch test fixes and improvements