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

* commit 'e5574e0b7316890bcbce2465e632a04049b57769':
  Try to fix RTE when updating shortcuts