Fix display issue of #4569.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge pull request #1393 from Tithugues/b4569_display_master

Fix display issue of #4569.