Merge "Add timeout for mount on untrusted media" into main