Merge "Make task fullscreen when locked" into nyc-dev