Merge "Add log in EmitSingleTap" into devel/master