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

Change-Id: Idb7c86cae2974d31a04aefec34a6ee7baeafb7ec