Merge commit '353bf45201e9440b61de8f89c92d1823ba55a198' * commit '353bf45201e9440b61de8f89c92d1823ba55a198': Various fixes and improvements to window, activity.
Merge commit '353bf45201e9440b61de8f89c92d1823ba55a198' * commit '353bf45201e9440b61de8f89c92d1823ba55a198': Various fixes and improvements to window, activity.