Merge "Wake-screen gesture implementation"