Merge "Hide the lock icon if there's no screen lock"