Merge "Track added/removed window when focus is null" into oc-dev am: e8f39b53d4
am: cb58f5603a

Change-Id: I2bc86c8733f50371cac03302e4eec4368f337747