Merge "Make activity on visible and focusable leaf tasks be resumed" into sc-dev