Merge "slim_ngd: Handle runtime-pm resume error gracefully"