Merge "Do not require keyguard message's min time if being update to empty" into main