Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev