Merge "Fix Recents dismiss/back button behavior" into jb-mr1-dev