Merge "Move screenshot thumbnail above actions" into main