Merge "Delay frozen app sockets close until the cellular modem wakes up" into main