Merge "UiEventLogger option to log uid + package_name."