Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev