Merge "Do not reset the focus if next snapshot is pending." into ics-mr1