Merge "Support for dynamic shortcuts." into arc-apps