Merge "Fix a bug in querying showing state for action bars"