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

Change-Id: I26cc9808c11d752b7004e5a04bce665410b32a35