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: 746a1d1f am: 066ca70d am: b0cac30e
Change-Id: I7a3fde9acf602de0bbbef3b9b1a0b907c421579f