Merge proposals dependent on lp://staging/~abreu-alexandre/ubuntu-html5-theme/rtm-content-picker-ui-fix

1. rtm-content-picker-ui-fix
2. Dependent merge proposals