Merge "Fixed status bar window height not updating when enabling cutout."