Merge "Add margin to SUW back button" into tm-qpr-dev