Merge "Add support for always_constrain_display_apis flag" into sc-dev