Merge "Add icons to choose lock dialog"