Merge "Removing douple lookup when calling startActivityAsUser"