Merge branch '14' of https://github.com/nnn950711/packages_apps_ParallelSpace into HEAD