Merge "DOn't save encryption settings when not encrypted" into mnc-dev