Merge proposals dependent on lp://qastaging/~zsombi/ubuntu-ui-toolkit/bottomedgehint_activefocus

1. bottomedgehint_activefocus
2. Dependent merge proposals