Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB."