Merge "Introduce new preference indicating user control."