Merge "Handle right back swipe differently for cross task back" into main