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

Change-Id: Ic0aff571bdb29570e2e5b56a5ce76c75d27f69e3