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

* commit '25902813203008c300e8beebaaba8ff5e44433b6':

Change-Id: I8ad5e3fb254e3f8c148e85a705c24165f8857712