Merge "Dump user id in dumpsys activity starter" into oc-dev