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

* commit '63cc22a5c393fec725d271f5a7d82fb2fe05647f':
  more app launch test tweaks