Merge "Replace ADISPLAY_ID_ constants with LogicalDisplayId equivalents" into main