am 19bea5ef: am a751d97e: Merge "Fix layout glitch specific to quick-settings...
am 19bea5ef: am a751d97e: Merge "Fix layout glitch specific to quick-settings -> settings." into klp-dev
* commit '19bea5ef':
Fix layout glitch specific to quick-settings -> settings.