Merge "Converting orientation handler classes to kotlin" into main