Merge "Quantum for text fields, buttons, radio buttons and check boxes"