Merge "Fixing issue with configuration states not being reset on configuration change." into lmp-preview-dev