Merge "Show custom message when user has specifically locked down the device." into udc-qpr-dev