Merge proposals dependent on lp://qastaging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1305190-ubuntu-app-launch

1. fix1305190-ubuntu-app-launch
2. Dependent merge proposals