Merge "Set switch to the correct enabling state" into lmp-dev