Merge "Test for Settings Intent"