Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev