Merge "Prevent power state queries for 2.0 devices" into sc-dev