Merge "Adjust QS top padding" into tm-dev