Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev