Merge "Support addWindow as other user" into rvc-dev am: 1a46294fdb

Change-Id: I46d6d7bad9a6097638843e186a40758c282b850f