Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0