Merge changes Ia815d9d8,I30ce0527 into main

* changes:
  Interrupt temporarily engaged timer while priority session is active
  Extend user-engaged timeout to STOPPED, NONE, ERROR states