Merge "Prohibit archival of system apps." into main