Merge "Fix DND crash from SpringboardActivity" into pi-dev