Merge "Fix fingerprint dialog icon color" into pi-dev