Merge "Unbind from dream overlay in onUnbind." into tm-dev