SF: do not extend DisplayDevice lifetime
am: 769ab6f949

Change-Id: I6f9fac64741773b302c884c7684a9630766e63d8