Merge "Fix a bug where the status bar scrim doesn't animate." into main