Merge "Unlocking getDisplayByUserIdAndWindowId" into main