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