Merge "Fingerprint navigation settings is a secure setting" into pi-dev