Merge "Rewire BiometricEnrollActivity to setup pages"