Merge "Hide Lock icon when dozing."