Merge "Allow system apps to be disabled" into nyc-dev