Find offset after rendering and simplifies computation
Merge remote-tracking branch 'origin/popup' into lk-sigma
Update build plugin.popup