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

Change-Id: I1dac45e67915a177ed78f994f4ecfe4c223dc308