Merge "Fix occasional jank when going to QS."