Merge "Fix crash bug when update shortcuts"