Merge "Make sure the app is still app after launching. Bug:8755950" into jb-mr2-dev