Merge "Bluetooth: Change keyboard icon to normal system color" into oc-dr1-dev