Merge changes I675dbe99,Ia6daa741 into sc-v2-dev

* changes:
  [Hotseat] Fix hotseat edu flicker
  [Hotseat] Show edu tip within screen bounds