Merge "Minor UI tweakings" into klp-dev