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

Change-Id: I83187d8996856b42343f061149f52349ba4c87d3