Merge "Add a setting to support for NITZ retention"