Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev