Merge "Add setting and detection of ro.sys.safemode property." into nyc-dev