Merge "Support multi-window on low-memory watches." into oc-dev am: c6372cceb1
am: ba90d46a6e

Change-Id: I133f2ede861a2c55df7cda26f34c80447c80733d