Merge "Increase orientation settle time. Bug: 4981385"