Merge "Move focus dispatch to input (1/2)"