Merge "Revert "Fix P2P dialog time remaining text being cut off"" into udc-mainline-prod