Merge "don't log auto-expansion of notificaitons" into oc-mr1-dev