Merge "DO NOT MERGE: Don't backup night mode setting" into mnc-dev