Merge "Add SystemModalsTransitionHandler to deal with system modal transitions" into main