am 90976c84: (-s ours) Reconcile with jb-mr1.1-release - do not merge

# By Adam Powell
# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '90976c8493ab9439eb8ddaad30aaa0d171467f43':
  Fix re-enabled state of up after action view collapse