Merge "Fixes NullPointerException if display address is null" into main