Merge "Merge "Fix Keyboard stays on while startSeamlessRotation" into rvc-dev am: 641c8844" into rvc-dev-plus-aosp