Group storage moved to AsyncTask to avoid dropped frames
Merge remote-tracking branch 'origin/master'