Fix topic preview

Bug: 61169

Change-Id: Iba294667983bff3b8dbcf5f6850f8cf7e2d467c5
(cherry picked from commit ffc87c0dba23d0c010b6abb84d4475afdfba43d5)
Flow watchlist data tweaks

Bug: 60723
Change-Id: I27d0dbe1d30fdba646f40c2c47671cb4c07052d1
(cherry picked from commit 97ac431275d08589c8938910d2e344af420299e5)
Merge "Flow watchlist data tweaks" into wmf/1.23wmf14
Merge "Fix topic preview" into wmf/1.23wmf14