Merge "Camera2: Set preview size based on setprop"