Merge "Use support lib shortcut manager in sample apps" into oc-dev am: b0bcb8f365
am: c6df549cdd

Change-Id: Ie921194589ef11dd8094a6adfa45bca5e16ad586