am a1d84550: merge in master-release history after reset to 51bf632da3d907669e0d89246f5dcaf7dfd031d1

* commit 'a1d84550f39728b7a68e3f9c85d7f757ea55f114':
  Clean up tablet layouts in Calculator
  Add missing layout params