Merge "Add more fragments to valid list for Wifi activity" into klp-dev