Merge changes I53b9dab1,If8a33073

* changes:
  Make mock tasks work again.
  Fixing layout issue causing overlay to sometimes not appear.