Merge "No longer showing overflow for APKs." into jb-ub-mail