Merge "Inflate handle view as part of expanded view layout" into main