Merge "Don't force black status bar when expanded."