Some fixes for recent thumbnail scale animation

Change-Id: Id7e620b9f1be148bdccdd7de8f91f0b40a4e92ca