Merge "[automerger skipped] Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86ca -s ours am: 4bb7c65788 -s ours" into rvc-qpr-dev-plus-aosp