Merge "Revert "Only allow AM to update display orientation based on app containers"" into oc-dev