Merge "Fix fingerprint icon on pattern screen"