Merge "Added lock screen settings section"