Speed up orientation rotation

Change-Id: Ib5b0cc32c0617b964cfde72581ea958882fe7012