Merge "more app launch test tweaks" into jb-mr1.1-dev