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

Change-Id: I4b7f8e43747d168b8df1ddb60e5fcc389afb2369