Merge proposals dependent on lp://qastaging/~nikwen/ubuntu-calculator-app/reboot-white-splash-screen

1. reboot-white-splash-screen
2. Dependent merge proposals