Merge "Revert "Call noteOperation() in ShellDelegate so that noteOp() really passes."" into rvc-dev