Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev