Merge "AOD padding animation should match slice" into pi-dev