Merge "Fix some visibility state transition issues with ActionBarView" into jb-mr2-dev