Merge "Add CONSTRAIN_DISPLAY_APIS namespace." into sc-dev