am 9ec8a75d: Merge "Don\'t show triangle and on-press state if there is no action" into jb-dev

* commit '9ec8a75db9af13a04d241bd65ce5a9dcfafd48af':
  Don't show triangle and on-press state if there is no action