Merge "Add null check for component name when fetching uid" into qt-dev