Merge changes I7af876ab,Idd79864d into tm-qpr-dev

* changes:
  Decreases spacing between quick affordance items.
  UX polish for WPP quick affordance slot tabs.