Merge main into dev since branch was directly merged into main

Accidentally suggest-images-flavors-if-failed was directly merged into main instead of dev (!13 (merged)). Therefore main needs to be merged into dev to keep dev and main consistent.