Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread