Merge "Workaround stateful tinting bug on <= API 23" into mnc-ub-dev