Merge "Enable Hilt for picker app (3/3)" into udc-qpr-dev