Merge branch 'feature-sailfishos-cleanup' into development