am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content