Merge "Adding settings menu back... (5165175)"