Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev