Merge "Added settings UI for camera lift trigger gesture"