Revert "[Framework] Fix possible NPE on tablets"

This reverts commit 7e8f56d4a715f4b76846adb3445f32940a3d990a.

Change-Id: I1a5880967d24fc1df03233c8acbd464f1ad11d86