Bug 961938 - [DSDS][MMS] Switching data confirmation message will pop up twice
Merge pull request #15711 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 961938 - [DSDS][MMS] Switching data confirmation message will pop up twice r=julien
Revert "Bug 913782 - [Keyboard] Build time default keyboard selection work for"

This reverts commit 8225770e82b105f45b6b85be382bae94615b4fd1.