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
Change-Id: I9bf19635987694f6b4200b6a8af5543d15e5f327