Merge "sdm: clear cached geometry on successful prepare"