Merge "Gallery2: Fix force close issue when trim video"