Merge "Prevents system busy or restarted due to rapid activity launch loop" into udc-dev