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

Change-Id: I0d96c005559c0991baf4f1fa4928117124ca9801