Merge "Refine system bar position restoring" into rvc-qpr-dev