Merge "Pass non-null message of window op to AppOps" into rvc-dev am: 202e3811 am: 3204aed3 am: 7c6e1fe2 am: a329069a Change-Id: I3ea3a84ed62e78bf02939419db69ff1b7a04b87f