Merge "Multiple shortcut menu for android R (6/n)."