Merge "QCamera2: Support different color format for thumbnail"