Merge "Sysui changes to support vibrate icon setting" into tm-dev