Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo