Merge "Added a debug flag to turn on the AOD animation" into pi-dev