Keep show in timeline and onion skin options when merging layers
BUG: 377358 (cherry picked from commit 2b7c34108901249d940500cf8ddf91e41d7512a0)