Merge "Use networkType to display  wifi and mobile notification separately." into klp-dev