Merge "Debug code for window transition crash" into jb-mr1-dev