Merge "focusTransitionScaleAndDimOut should always go from 1f to 0f" into main