Merge "Use calculated frame offset instead of gyroscope." into ics-mr0