Merge proposals dependent on lp://qastaging/~kissiel/checkbox/checkbox-touch-logging-fixes

lp://qastaging/~kissiel/checkbox/checkbox-touch-logging-fixes has no merge proposals.