Merge "Fix some bluetooth theming issues." into nyc-mr1-dev