Merge changes I69a66dcf,I19b4ee8b into main

* changes:
  Improve HandwritingInitiator handling of disabled views
  Small refactor of HandwritingInitiator State