Merge "Allowing useStillCameraForTimeLapse to be set through MediaRecorder.java"