Merge "Difficult to bookmark History items on ldpi-screens"