Merge proposals dependent on lp:~cxl/unity/add-timeout-remove-fixed

lp:~cxl/unity/add-timeout-remove-fixed has no merge proposals.