Merge "update inputdelay if changed"