Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev