0795684839
Merge commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e' * commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e': Allow setPreviewDisplay after startPreview.