Merge changes Icf5ac6f7,I3bb82fa9

* changes:
  Remove mDisplayGroupIds by iterating through PowerGroups directly
  Pass PowerGroup instead of groupId where possible.