Merge changes Ibe1f0387,I2d1ec382 into tm-qpr-dev

* changes:
  Moves quick affordances to data layer.
  Changes quick affordance key to string.