am 6327c580: (-s ours) am 8bab83c8: am 598e9a68: Merge "Persist favorites clicked listener across activity destruction" into klp-dev

* commit '6327c580804d6d9e1bb01a79d38d2ed0cc5f7bb9':