Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev