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

Change-Id: I4b86fb520fe2bee55a2e9368bb7cf4bb18c3103e