Merge "Reduce calls for target power state" into sc-dev