Merge "improve orientation sensor with gyro data"