Bug fixes and resolved crash situation on phone sized resources

Fixed MOBILE-1420, fixed MOBILE-1411