Merge "Fix switching clock in picker not take effects on lockscreen" into main

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow

import kotlinx.coroutines.flow.callbackFlow

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.mapNotNull

import kotlinx.coroutines.flow.onStart

                awaitClose { clockRegistry.unregisterClockChangeListener(listener) }

            }

            .mapNotNull { it }

            .distinctUntilChanged()

    override val currentClock: StateFlow<ClockController?> =

        currentClockId