Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 2d5732ca4a

Change-Id: I0c6b3174c8be750a2df9346e4c99d96bcd5a61cb