Merge "Fix issue with slow status bar tint transition"