Revert "Refactoring:  Use resource alias for Handset/Tablet layout selection."

This reverts commit 83eb9e6f625943ea4e3297105778f8ebff070ab2.