Merge "Move injected tiles under debug section"