Merge "Attempted to fix NPE when report assistant context" into sc-dev