Merge changes Ibb63814e,I0322b1e6 into lmp-dev

* changes:
  Prevent full shade guesture from doing the wrong thing
  Add current user announce to MultiUserSwitch