Merge "Ignore InterruptedException from Thread.sleep()"