am 558030ee: am 555fddb0: Merge "change how app launch is tested" into jb-mr2-dev

* commit '558030ee12d1688b892079270a65dc1744040938':
  change how app launch is tested