Merge "Make transition ready if display becomes empty" into main