Merge "Call Redirection: unbind service when onBind returns null" into udc-dev