Merge "Pass non-null message of window op to AppOps" into rvc-dev am: 202e38118a am: 3204aed3eb am: 4953108456 am: 0022f2294d

Change-Id: I1c8570e3cf3c318ba3bad84b67186091b6e06661