Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev