Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev