Merge "Active window not updated window not updated properly." into jb-dev