Merge "Relying on the controller state instead of animator state for icon alignment" into tm-qpr-dev