Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev