Merge "Make sure topActivity always retrieves focus when move task to back" into udc-dev