Merge "Move Activity multi-window event logic out of the public methods" into...
Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev am: 56e2aeba
am: d8cc73d9
* commit 'd8cc73d9':
Change-Id: I7dcd7399612d5865ccbf915a98d822ad2eb6a70d