Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev