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

Change-Id: I335f50bd29cb2f46b84eaacbe8bfcf52185d5f01