Merge "Optimize state changes"