Merge "Increase screen-on delay in ConnOnActivityStartTest."