Use correct overridden method for ActionBar
Remove tablet specific conditionals and layouts
Remove layout view for passcode
Merge pull request #653 from bhariharan/min_42

Use unified layouts and remove tablet specific conditionals