Merge proposals dependent on lp://qastaging/~sil2100/ubuntu-themes/osk_design_icon_association_change

1. osk_design_icon_association_change
2. Dependent merge proposals