Merge "Fix 7216870: recents relaunches dismissed activity" into jb-mr1-dev