Merge proposals dependent on lp://qastaging/~universal-applets-core/universal-applets/other-files

1. other-files
2. Dependent merge proposals