Merge "Revert "Add developer option for freeform window support (2/2)"" into nyc-dev