automerge: 647beed * commit '647beed62236c996b946e85d06fdf4335b6a2a80': Increase timeout when uncrypting OTA