Merge "Integrity test to recover allowlisted system app tampering" into main