Merge "sdm: Handle idle fall back and idle power collapse with same event"