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