Merge "Fix view foreground tinting" into mnc-dev