Merge "Adding trunk stable flag for AE backstack restore" into main