Merge "Freezer: fix binder race" into sc-qpr1-dev