resolved conflict after cherry-pick
filmstrip frames async false