Merge changes from topic 'fix_activity_changed_cb-oc-dev_style_things' into oc-dev

* changes:
  Switch ActivityRecord to use static imports.
  Fix configuration change state transitions.