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