am 0601a280: Merge "Sometimes the application context is null"

* commit '0601a280e5db18ff2c084a0785504f959c2ff92f':
  Sometimes the application context is null