Merge "Fix issue with app not becoming visible" into oc-mr1-dev am: af6a558327
am: 4ebf25b833

Change-Id: I57cbbf6fb290fc49d09fb257ed9c10a2f2af4c25