Merge "Refine system bar position restoring"