Merge "Avoid NPE when screen title is null" into rvc-dev