Merge "Add a developer option which allows non-resizables in freeform"