Merge "Dedupe updates to the home handle tint"