Merge "Updated public surface control APIs" into sc-dev