Merge "Wait for UI plugins to load"