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

Change-Id: Id55c35f475c6c9184e5dfb0eda4fe03b7990a937