Merge "Removing BaseDraggingActivity > Merging come methods to BaseActivtiy > Separating wallpaper theme implementation to an independent class" into main