Merge "genfs_contexts: Specify correct GPU clock hint node" into sc-dev