Merge "Remove extra button from fingerprint enroll layout"