Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev