Merge "Add theme variables to SysUI dump" into oc-dr1-dev