Merge "Add defer-until-active policy to ACTION_SCREEN_ON/OFF."