Merge "Reset screen timeout upon keyguard touches for nssl migration" into main