Merge "Polish home-key from split to pip transition" into udc-dev