Merge "Use updateButtonLayoutSpacing() for all states" into tm-qpr-dev