Merge changes I0d0a8730,I47d68931 into main

* changes:
  Fix click on TileService bug when closing shade
  Add support for removeCallbacks in MockExecutorHandler