[lipstick] Prevent flicker when returning to composited mode

The surface item should be updated when going from direct rendering to
composited mode.
Merge pull request #64 from xknight/master

[lipstick] Prevent flicker when returning to composited mode