Merge "Polish up PRE_BOOT notification." into nyc-mr1-dev