Merge "Touch, wake and unlock" into mnc-dev