Merge "Minor QS visual fixes"