Merge "Avoid triggering support dialog in non-current user." into nyc-dev am: 5548733eb5
am: 2a098206c4

* commit '2a098206c484cf94babaf717438ae72bd20b7009':

Change-Id: Iac96054c50e5b0e60a9adb27716f0523567dbb7b