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

# Via Android Git Automerger (3) and others
* commit '638af2fbb6ecb6ca0e58b06d5b2c6ecabbc7f812':
  Fix regression in expanded action view up