Merge "Polish transition between desktop mode and overview" into main