Bug 942140 - [Settings] when invoked as an activity, we should have a cross instead of a back button and pressing it should move back to the caller
Merge pull request #14168 from arcturus/bug-942140

Bug 942140 - [Settings] when invoked as an activity, we should have a cross instead of a back button and pressing it should move back to the caller