Merge "Fix layout glitch specific to quick-settings -> settings." into klp-dev