Merge "Fix NullPointerException in PresencePublication"