Merge "Remove the static application context fetcher"