Merge "Pass non-null message of window op to AppOps" into rvc-dev am: 202e3811 am: 73df7ff3 am: ac479343 am: e02e719c Change-Id: I80c0a54c643b5f0d1bf0c751f17c23a787fd8d1b