Merge "SF: Fix two display identification bugs"