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

Change-Id: I7c33b554fc3ea8fa074afb0eb8a0631801208e61