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