Merge "Lock rendering when switching state."