am b941ab64: am d810db81: Merge "Set row heights for browse rows."

* commit 'b941ab64e8dc8e345ee9b520536992e5b3b99393':