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

* commit '5732aaf1bb38d0d7bc3535ee934c32a8fb8e8dd6':
  app launch test fixes and improvements