am a7e028a9: am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse

# Via Android Git Automerger (2) and Adam Powell (1)
* commit 'a7e028a976c3f3692fa3c72f0ae11c01354e4c9a':
  Fix re-enabled state of up after action view collapse