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

* commit '19bea5efdfa80e97f718d5a6043c69bb4a9a10c7':
  Fix layout glitch specific to quick-settings -> settings.