Revert "Revert "Revert "Fix error in build for Circle sidebar (Floating Mode)"""

This reverts commit 79b8d11fcc7bf9075883d6d3e34a0f4398176e22.
Revert "Base: App Circle sidebar (add support floating window)"

This reverts commit e8b62f4f8158a8e588db10989795e3f9096dda84.