Merge "Adjust QS side spacing in split shade according to specs" into tm-dev