Merge "SystemUI: Show mic-less headphone icon in status bar (2/2)" into gingerbread