Fixing issue with configuration states not being reset on configuration change.

- Also updating some interpolators

Change-Id: Ia29fc6f10705c7d286246162f894a25de7b4be40
6 files changed