Merge "Add logging constant to track settings entity header clicks" into oc-dr1-dev