Merge "Fix stale data in keyguard transport control display" into klp-dev