Merge "Restore dependency between volume settings and silent mode." into froyo