Merge "Rename shouldUseDefaultDisplayStateChangeTransition attribute" into sc-v2-dev