Merge "Cleaning up the overlay interface" into ub-launcher3-calgary
am: 10a0e8a5c6

* commit '10a0e8a5c65404bd6067b3e42de2ea360321b2e5':
  Cleaning up the overlay interface