Merge "Restore V2+ signature requirement for system apps" into tm-dev