Merge topic '14279_fix_rand_on_windows_attempt_2'

069f1024 BUG #14279. Fix random glyphs on Windows.
Merge topic '14813_fix_mode_shapes_range'

31ae6163 BUG #14813: Use correct range for mode shapes index.
Merge topic 'catalyst-updates'

1b5dcc28 catalyst: update editions for changes
16d437dd catalyst: extract ViewLayoutProxy tags as well
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I39ab825d84cadf7da3bd0c963e974206cea2b1de