Merge "Fix system bar UI"