Merge "sdm: Disable special handling for empty layer stacks"