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

Change-Id: Ie30b08be5795fd1e4493d7791f510b8d446742eb