Merge "Affordance returns to normal size after activation" into tm-qpr-dev