Merge changes from topic 'settings_advanced_expand_button'

* changes:
  Add logging for advanced button expand action
  Add FIELD_CONTEXT to track source of action in eventlog.