Merge "Weston crushed by ivi-input-controller" into eel