Merge "Use context id for getMainDisplayIdAssignedToUser" into main