Merge "Primary screen display optimization for the hero use cases" into main