Merge "Explicitly take flags in createContextAsUser()"