Merge "Fix unable starting home on an empty display"