Merge "Revert "Not handling portSelect and deviceSelect when device is standby""