Merge "Fix DND crash from SpringboardActivity" into pi-dev
am: 3f790b76b0

Change-Id: I310c86c8ca308e7e71d22441774bf8ce036b4ddb