Merge "Use originalView's context" into main