Merge "[wm]  Make dim animation duration respect transition animation scale" into main