Merge proposals dependent on lp://qastaging/~screenlets-testing-developers/screenlets/screenlets-testing

1. screenlets-testing
2. Dependent merge proposals