Merge "Revert "Set apex_available property"" into rvc-dev