Final fix for Settings intent

Change-Id: I953ecd371f69fa55289126c7a7d4fac2bf728637