catalyst: extract ViewLayoutProxy tags as well

Change-Id: Id7147264a6dca7c0cadaa6713d997288aa5da936
catalyst: update editions for changes

Change-Id: If69d90923be7b962620c27b402c99bc54dddb9f5
Merge topic 'catalyst-updates' into next

1b5dcc28 catalyst: update editions for changes
16d437dd catalyst: extract ViewLayoutProxy tags as well