Merge "Change logic to check recents bookend transition flag" into main