Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev