Merge "174236: Menu preview broken with appcompat-derived themes" into studio-1.3-dev
automerge: 0930b6e

* commit '0930b6eb06c96715eecf9622e08ddfaa43ce4673':
  174236: Menu preview broken with appcompat-derived themes