Merge "Change namespace and description of overriding power key gesture flag." into main