Merge proposals dependent on lp://staging/~therigu/unity-lens-applications/menu-entries-without-categories

1. menu-entries-without-categories
2. Dependent merge proposals