Merge "Fix bootloop when apps are quarantined" into main