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

* commit '4eab3d88a21b07d029a1b22271d7d1537a245266':
  more app launch test tweaks