Merge "Add sanity checking to bookmark click listener"