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

# Via Adam Powell (1) and others
* commit '569f138ef1a94e6d6cfc0587f06b396a77f00c1c':
  Fix regression in expanded action view up