Merge "Support GONE->LOCKSCREEN" into main