Merge "Fix NPE in edge back gesture handler" into sc-v2-dev