Merge "Add logging constant for screen lock settings"