Merge "Prevent taskbar on phone from crashing" into udc-dev