Merge "Add mapping for PROPERTY_CROSS_SIM" into sc-dev