Merge "Maintain keyboard configuration and reload layouts if changed" into udc-dev