Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2