Merge "clarify Paint flag docs" into klp-dev