Merge "Fix some jank when expanding quick settings"