Merge "Migrating to new footer button for ChooseLockPassword page"