Merge "Return different Window handle after ReplaceWindow is called" into devel/master