Merge "Don't override alpha for indication area" into main