am 32ec47c1: am 63cc22a5: am 4eab3d88: Merge "more app launch test tweaks" into jb-mr1.1-dev

* commit '32ec47c1b15b5a9c8f8d9e9f324bb6fe353119fe':
  more app launch test tweaks