Merge "Fixed the bug that UI cannot be registered to MSB"