Merge "Minor TextView Context Menu refactor" into main