Merge "Check appEntry is not null before dereferencing it" into sc-dev