Merge "EBS should always be able to toggle UiMode"