Merge "Pre-emptively take a snapshot when finishing an activity before changing visibility" into qt-r1-dev am: 6836e6d02e
am: c3593d7850

Change-Id: Id7c76d6ce508626b328039030ff6410531d6608a