Merge "Refactor hidden API runtime flag from negative to positive"