Merge "slim_ngd: Handle possibility of ADSP idle power collapse"