Merge "If an Activity transitions to VR, then ensure it's in the main stack."...
Merge "If an Activity transitions to VR, then ensure it's in the main stack." into oc-mr1-dev am: 9ccbb297
am: 55ceb102
Change-Id: I6b813cca65aedb11f4b38d3b871c5963c946fa8f