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