Merge "Fix NPE by making Toast on UI thread" into udc-dev