MB-8652:  restore 2.1.1 display

Change-Id: Ifc2a35ee3d789d977dd02db2b2051430891b599e