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

Change-Id: I9b90d07b011c019da8b24f17ded6d53742c17a53