Merge "Initialize display id of fixed rotation listener correctly" into main