Merge "change how app launch is tested" into jb-mr2-dev