Choco butter 2 become1

Fix the UI testcase hanging due to instrumentation dialog.