Merge "Adding support for importing/exporting launcher layout" into main