Merge "AOD group notification style" into pi-dev