Merge "New Controls API @hide"