Merge "SF: Remove display lookup in Layer classes" into rvc-dev am: 8a908e784f am: 79ff755388 am: 3afe40d8a6

Change-Id: I8a244399287bf276c61675196c8feae76a78e574