Merge "Fix bug in isManagedKiosk" into udc-dev