Merge "Fix issue with fetching display id from activity."