Merge "Unregister handler for multi-SIM configuration change"