Merge "Pre-emptively take a snapshot when finishing an activity before changing visibility" into qt-r1-dev