Merge "Move Activity multi-window event logic out of the public methods" into nyc-dev