Merge proposals dependent on lp:~tom-gall/linaro/live-helper-netbook-efl-add-default-settings

1. live-helper-netbook-efl-add-default-settings
2. Dependent merge proposals