Merge "Notify user when forced to boot into safe mode" into nyc-dev