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

* commit '8ebc6e80b817a4cef84f074aa14607d2c380b8f7':
  Avoid triggering support dialog in non-current user.

Change-Id: I3850b49c3814befd34ec04a9264889175de0c9e8