Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev