Merge "Restore the behavior of adding a RESUMED activity to stopping list"