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

* commit 'fdc0d9295fbe855b14e1730447b079191f2a4f8c':
  app launch test fixes and improvements