Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev