Merge "Fix notification padding and slice collision" into pi-dev