Merge "Not calling startUi() if no longer bound" into jb-dev