This also squashes in the following fixes from cm-13.0:
Ia4291d8ac3d1dbf76d432db7e0e973844163c4ae Fix NPE.
Ibe7fdf1ee7f0aa1c7c76052df69fa92e8b6a2ffd Fix up increasing ring tone volume preview behaviour.
Id32d6b51aab05e80be59bc1912c4ae7c5d114ac5 Settings: Always set ramp-up time value during bindView

Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be