Merge "Fix force close of voicemail activity caused by screen rotation" into nyc-mr2-dev