Merge "[Fingerprint] Show skip button during SUW" into mnc-dev