Merge "Remove config_drawNotificationBackground and resulting dead code" into main