Merge "make bluetooth iconography consistent with other quicksettings icons." into jb-mr1-dev