Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
am: 8a698a1721

Change-Id: I7dd30182184fc5ce6ec5e9750eaa26f174b79b38