Merge proposals dependent on lp:~johan-schonning/forssim/focus_fix

lp:~johan-schonning/forssim/focus_fix has no merge proposals.