Merge "Use AUTH_SCRIMMED_SHADE if transitioning to shade"