Merge "Fix AOD styling when pulsing" into pi-dev