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