Merge "Remove legacy layer path in screenshot pathway" into main