Follow-up: Ifeda5996385 – 'mediaviwerpilot.dblist' is ugly

Change-Id: Ie7597f5f98d87c9d4453a983ff353a7614042295
Merge "Follow-up: Ifeda5996385 – 'mediaviwerpilot.dblist' is ugly"