Merge "Fix some jank in quick settings" into nyc-dev