Merge "Fix WifiDialog app showing a solid background on U-on-T" into udc-dev