Merge "Adjust interpolator for shade unlock to match mocks." into tm-dev