Merge "Fix alignment of notification action buttons."