Merge "Remove Hotseat Education from Large Screens" into udc-dev