Merge "Notify user when forced to boot into safe mode" into nyc-dev am: 525032754e
am: ebbe844952

* commit 'ebbe844952c2be2c2b901e8fbaad4b5ec6e2119e':
  Notify user when forced to boot into safe mode