Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev