Merge "Add developer option for freeform window support (2/2)"