Redo lost commit for overview fix

Redo Ic92978fbce45caa0ea58ad6d8ba56fb2bf8354c7 which got
inadvertently reverted.

Change-Id: I3e474f3c51cc7c2233c214b572fa0f4d98c34a8c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/862