Merge "Add the window lock property."