Fix initialization and shifting of right margin views during animations