Merge "eliminate notification clicker garbage." into mnc-dev