Merge "Use display aware context, resources, configController and Layout inflater in shade dir" into main