Merge proposals dependent on lp://qastaging/~guijemont/pigment/event_handling_fixes

lp://qastaging/~guijemont/pigment/event_handling_fixes has no merge proposals.