Merge "Fix showing CallingAccountSelector in lock screen"