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: 6e90b67d
* commit '6e90b67d':
Move Activity multi-window event logic out of the public methods
Change-Id: I1eb6677d8ecd2208b20c2094eb4d708f6e20bc14