Merge "Add tap to wake setting" into mnc-dev