Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev