Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev