Merge "Hide touch indicators on mirrored displays if a secure window is present" into main