Merge "Fixed some issues with fullscreen dimming" into nyc-dev