Merge "Fix fingerprint settings ripples" into mnc-dr-dev