SF: do not extend DisplayDevice lifetime am: 769ab6f949
am: 93948316cb

Change-Id: Ice72c32f6eeee51a83793fc4284715f3f4c8f924