Merge "Add metrics constant for Choose Lock Dialog"