Merge "Rename buttons in lock screen setup" into oc-dr1-dev