Merge "Fix consequent activity launch on virtual displays" into oc-mr1-dev
am: 7a09f7ec9c

Change-Id: I97fb5d929215147d9512bc89f3fd55f528b84393