shieldtablet: Update from rel-st8-r2.4