More Galaxy-Note-10.1-specific changes