Merge "Avoid users add one-handed mode by edit shortcut dialog in unsupported devices"