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
am: 1c191304
* commit '1c191304':
Change-Id: If3281d896e27e118b2100233c2a46badf47d2a90