Merge "Add control for double tap to wake setting" into mnc-dev