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

# Via Android Git Automerger (2) and others
* commit '6a33c4031de8f0b323855c6db8d6ee0c812b0f00':
  Fix regression in expanded action view up