Merge "Adjust back button's padding for SUW" into main