Merge "Fix NPE in logActionClick"