Merge "Fix to register the receiver for all users"