Merge "Add deferral-until-active policy to ACTION_SHUTDOWN broadcast." into main