Merge "Fix visibility issue with fingerprint icon." into pi-dev