Merge "SnapdragonCamera: Fix the 4K video relative toast issue"