Merge "Add shell background executor to bubbles and put unregister call on it" into tm-dev