Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd am: d999e53487
am: fb6616a6a6

Change-Id: Id4a4ef2672c614ac4343becf238f654c8e83caa5