Merge "Show colorAccent icon color for connected Wi-Fi entry" into sc-dev