Merge "Remove CM account and wallpapers" into mm6.0