Merge "Add back developer option for freeform window support."