Merge "Selected border visible in light theme." into tm-qpr-dev