Merge "Fix Home key causes wrong animation" into jb-dev