Merge "Remove data item from app info when not supported" into mnc-dev