remove library launcher and clean up capture view
Merge remote-tracking branch 'origin/master'