Merge "Fix NPE due to invalid RecentsView access" into udc-dev