Merge changes I2fd961c0,Id3d21f44 into main

* changes:
  Go to NORMAL state before adding widget with add button
  Retain add button on rotation for two-pane and bottom sheet