Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null"