Merge "Add null check for input view." into udc-dev