Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev