Merge "Change vector setup check to use non-themed drawable" into nyc-support-24.1-dev