Merge "Move displayId out of KeyguardState Transition object." into main