Merge "Show non-framework attributes in simple mode when they\'re available" into studio-1.3-dev
automerge: 7925217

* commit '7925217a51480818141e9fccf827aef87489c92a':
  Show non-framework attributes in simple mode when they're available