Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2