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

Change-Id: I7a1420c595f187923ad565d080e05c15c98d7dce