Merge "Confine shell domain in -user builds only."