Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev