Merge "Do not set window crop of task until display is enabled" into main