Merge "sdm: Make commit synchronous if power state is involved."