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