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

Change-Id: Ib141af3ec3bf37dac236f43cb19e64b5837e9c27