Merge "Transition to current state after icon timers expire" into tm-qpr-dev