Merge "Don't show starred mailbox, if account has no starred" into honeycomb