Merge "Fixed battery drain after modem reset" into pi-dev