Merge "Fix initial Bluetooth icon state." into ics-mr1