am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '67389e0acec6877528c4cdaed99bf0a295bf74b9':
  Fix regression in expanded action view up