Merge "Increase visibility of accessibility focus highlight" into klp-dev