Merge "Fix a race condition when registering IMS callbacks via ImsStateCallback"