Merge "Updated screen lock type picker footer strings"