Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev