Merge "Fixes bookmark scrolling highlight"