Merge "SF: Remove display lookup in Layer classes" into rvc-dev