Merge "Use different bg drawable for settings/history btn" into main