Merge "Updates the top-resumed activity if nothing to resume" into main