Merge "Wait until AllSetActivity.onResume to start the background animation" into main