Merge "Clear mWindowAdded when window was not added. DO NOT MERGE" into jb-mr2-dev