Merge "Use support lib shortcut manager in sample apps" into oc-dev