Merge "SF: Clean up name lookup in ComposerHal.{h,cpp}"