Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev am: 25cedc232d
am: 5cec9b9efa

Change-Id: I844c2808150486f3af9c29b9f8fd2f63f8050a85