Merge changes Ida3a640f,I2c3c689a into main

* changes:
  Add base scenario test for enter desktop mode with app handle menu.
  Add instrumentation for enter window mode with app handle menu CUJ.