Merge "Prevent Recents from doing a relayout" into jb-mr2-dev