Merge "Use stored power state for 2.0 devices" into sc-dev