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

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