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