Merge "Fix NPE on logContextCommitted()"