Merge "Support multi-window on low-memory watches." into oc-dev