am a0e308fb: am e77bba8f: am 18920136: Merge "Reset notification state on wifi enable" into froyo