Merge "Fix bug in calling opChanged on suspend"