Merge "[flexiglass] Adds support for locking when entering dream state" into main