Merge "Add DND indicator to AOD" into pi-dev