Prevent deferring control points indefinitely

Change-Id: I733e36bf31eedd85c871699b82c023ef1fcf643e
Merge "Prevent deferring control points indefinitely"