Merge "[CtsVerifier] Make sure to re-set picture size when opening camera." into lmp-dev