Merge "Tell JVM to not wait for HWUI worker threads upon shutdown"