Merge "Add synchronous transaction to wait for setInputWindow to complete (3/n)"