MOBILE-142: Adjust timing