Merge "Remove redundant wifi-display notification." into lmp-dev