Merge "Make all activities on visible and focusable leaf tasks be resumed"