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

Change-Id: Id4214b8cddca709252291dbd0154fd0ca89d0963