Merge "Hiding replied notification icons from AOD" into pi-dev