WIP fix logic problems with lipstick==compositor assumption