Merge "Add wtf log when starting activities with different uids"