Merge "Settings: Phone force close when set viocemail in speed dial settings" am: 0b88c3870e
am: 96b3833876

Change-Id: I2e823f5748a878da65055cf2680da0800d889f89