Merge "Improve ViewDebug reporting for focus properties" into oc-dev