Merge "Longpress power lockscreen torch [1/2]" into new-mm6.0