Merge "Support the about device warning message for tablets"