Merge "Merge "Don't lock rotation to natural rotation when entering overview" into rvc-dev am: ec096672 am: 3bed25d0" into rvc-d1-dev-plus-aosp