am d4532bb7: Merge "Fixing issue where widgets could be inflated in wrong orientation (issue 6584646)" into jb-dev

* commit 'd4532bb728f12fed3633370d8c44959a035ed5b3':
  Fixing issue where widgets could be inflated in wrong orientation (issue 6584646)