Merge "Replace blue highlight feedback with gray." into klp-dev