Merge "Merge "Fix guest tint" into oc-dev am: 70d4423eb6 am: dd4a9a2a18"