Merge "Revert "Sometimes the application context is null""