Merge "Pass non-null message of window op to AppOps" into rvc-dev