Merge "Add support for window docking in the property sheet code"