Merge "Fix status bar flickering" into rvc-dev