Merge "Add some more trace marker for render + swap buffer" into devel/master