Merge proposals dependent on lp://staging/~ted/indicator-display/fix-cppcheck

lp://staging/~ted/indicator-display/fix-cppcheck has no merge proposals.