Merge "Prevent potential NPE when updating state to bar manager"