Merge "sdm: Fix hw layer stack corruption"