#1394: Small fixes to layout update. Only update contexts, remove shield_default, reduce limit to 30.