Merge "hikey960: Fix race condition between hotplug and idles" into integration