Merge "QCamera2: Increase map/unmap timeout to 1 sec."