Merge "Fixing NPE when updating controller state."