Merge "Dump KeyguardMediaController state" into main