Merge "Add hysteresis to orientation rounding." into ics-mr0