Fixes RTE not enabling itself sometimes when shown from a hidden state.
Merge branch 'release/2.1' into release/2.2