Merge "Force update wifi QS when opening." into oc-dr1-dev