Merge "Round animation progress for computing size for background" into oc-dr1-dev
am: 75176be75a

Change-Id: I7c018b5eadc66db0d91542e089899123a85a8877