Merge "make sure to update session controller to power off state" into 24D1-dev