Merge commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5' * commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5': Fix #2269582 Sometimes camera preview screen is truncated
Merge commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5' * commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5': Fix #2269582 Sometimes camera preview screen is truncated