Merge "Get entitlement configuration from intent extra" into rvc-dev