Merge "Fix app crash when testing"