Merge "Prevent non-admin users from deleting system apps." into tm-dev