Merge "Add mechanism for determining if apps are system apps" into cw-e-dev