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

* commit '26a16c24d72194c7a85b66cb4f90756ec4fb4597':
  Try to fix RTE when updating shortcuts