Merge "Correct the logic of identifying Home" into udc-dev