Merge "Merge "FingerprintController: Make sure to reset the fingerprint mode when going to sleep" into oc-mr1-dev am: b140dc40d4 am: 837282ea25"