Combine 'Current submissions' and 'Archived submissions' into 'Submissions' Change-Id: I7f19c163f42b76add273114a73d394a524e86a74
mentioned in commit 3aec7c8f