Merge "Allow backup payload for shortcuts from secondary user"