Refactoed shell animation. Fixed a perf issue. Fine tuned settings view layout
Fixed merge conflicts