Merge "Prototype flag for moving controls"