Merge proposals dependent on lp://qastaging/~desrt/indicator-appmenu/no-zero-indicator-penalty

1. no-zero-indicator-penalty
2. Dependent merge proposals