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

Change-Id: I3499d966dc279590654d0c074dbe982802b63877