Merge "Fix calc visible to account for action bar"