Merge "Set FaceDownDetector disable-able by user" into main