Merge "Do not reload launcher when changing active display" into sc-v2-dev