Merge "Fix NPE in TaskSnapshotController" into oc-dev