Merge "app launch test fixes and improvements" into jb-mr1.1-dev