Merge "Supress fingerprint cancellation messages in lock screen." into sc-dev