Merge "Sets the launch display id for Context associated with a display" into main