Merge "Wake screen gesture"