Merge "Remove delay from enroll start button" into qt-r1-dev
am: ca2bbdfeca

Change-Id: I59870f9318f9ac84107c437aaa660f3d28b861c5