Merge "Music: Fix abnormal album display upon rotation."