Merge "Fix transaction too large exception on creating shortcut b/35515740 Test: manual build/push and reboot. Create shortcut from widget tray."