Merge "msm_serial_hs: Don't configure gpios into UART Mode always"