Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev