Merge "Inline Controls hide Settings button when no appropriate link." into oc-dev