Merge "Notify ScrimController when unlock finishes, so we can update relevant conditions." into udc-qpr-dev