Merge "Limit number of window context without any window" into rvc-dev am:...
Merge "Limit number of window context without any window" into rvc-dev am: 1e52a093 am: 20f72281 am: 3e62b75d am: 91368648 am: d9edfc24
Change-Id: Ic2d9ede0122b24e626064ff457f80c48df5b5a27