Merge "Fix 'back to the first-level when recording'." into ics-mr1